acm: Changes to files missed in previous cleanup patch.

Signed-off-by: Stefan Berger <stefanb@us.ibm.com>

diff --git a/xen/acm/acm_core.c b/xen/acm/acm_core.c
index 57db1369f542d55a6d918c61443e39e83ec1cf0d..73f48e983ebb978139f4fe5dce79a3b3fecdc37d 100644 (file)
--- a/xen/acm/acm_core.c
+++ b/xen/acm/acm_core.c
@@ -312,18 +312,28 @@ acm_init(char *policy_start,
 int
 acm_init_domain_ssid(domid_t id, ssidref_t ssidref)
 {
-    struct acm_ssid_domain *ssid;
     struct domain *subj = rcu_lock_domain_by_id(id);
-    int ret1, ret2;
+    int ret;
  
     if (subj == NULL)
     {
         printk("%s: ACM_NULL_POINTER ERROR (id=%x).\n", __func__, id);
         return ACM_NULL_POINTER_ERROR;
     }
+
+    ret = acm_init_domain_ssid_new(subj, ssidref);
+
+    rcu_unlock_domain(subj);
+
+    return ret;
+}
+
+int acm_init_domain_ssid_new(struct domain *subj, ssidref_t ssidref)
+{
+    struct acm_ssid_domain *ssid;
+    int ret1, ret2;
     if ((ssid = xmalloc(struct acm_ssid_domain)) == NULL)
     {
-        rcu_unlock_domain(subj);
         return ACM_INIT_SSID_ERROR;
     }
 
@@ -355,12 +365,10 @@ acm_init_domain_ssid(domid_t id, ssidref_t ssidref)
         printk("%s: ERROR instantiating individual ssids for domain 0x%02x.\n",
                __func__, subj->domain_id);
         acm_free_domain_ssid(ssid);
-        rcu_unlock_domain(subj);
         return ACM_INIT_SSID_ERROR;
     }
     printkd("%s: assigned domain %x the ssidref=%x.\n",
-           __func__, id, ssid->ssidref);
-    rcu_unlock_domain(subj);
+           __func__, subj->domain_id, ssid->ssidref);
     return ACM_OK;
 }
 

diff --git a/xen/include/acm/acm_core.h b/xen/include/acm/acm_core.h
index a09294cfc9efd514906dfdfb548cb205d8bea094..2d60571cf808aeb9d8d40e45737064b431dccc11 100644 (file)
--- a/xen/include/acm/acm_core.h
+++ b/xen/include/acm/acm_core.h
@@ -120,6 +120,7 @@ struct ste_ssid {
 
 /* protos */
 int acm_init_domain_ssid(domid_t id, ssidref_t ssidref);
+int acm_init_domain_ssid_new(struct domain *, ssidref_t ssidref);
 void acm_free_domain_ssid(struct acm_ssid_domain *ssid);
 int acm_init_binary_policy(u32 policy_code);
 int acm_set_policy(XEN_GUEST_HANDLE(void) buf, u32 buf_size);